Fix cross-compiling declarations

Multi-Arch: foreign is for shared-data packages, see
https://wiki.debian.org/Multiarch/Implementation#Multi-Arch:_foreign_support_packages

Multi-Arch: allowed is for compilers and things, e.g. see python3 and make

diff --git a/debian/changelog b/debian/changelog
index 8c4307a9210e5d4183005fb60347b6abaed244f0..86f32eb194458a5d20aceaf88092247a13e4b515 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cargo (0.17.0-3) UNRELEASED; urgency=medium
+
+  * Fix cross-compiling declarations, Multi-Arch: foreign => allowed
+
+ -- Ximin Luo <infinity0@debian.org>  Wed, 21 Jun 2017 15:30:28 +0200
+
 cargo (0.17.0-2) unstable; urgency=medium
 
   * Re-embed libgit2 0.25.1 due to the Debian testing freeze. It will be

diff --git a/debian/control b/debian/control
index 4f33b2050ed4164c1561807a2fd95b299081e8db..4d25dd1b14f1e887acbea3459a4edbb0ea70e982 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,14 +5,14 @@ Uploaders: Luca Bruno <lucab@debian.org>,
  Angus Lees <gus@debian.org>,
  Ximin Luo <infinity0@debian.org>
 Priority: extra
+# :native annotations are to support cross-compiling, see README.Debian of rustc
 Build-Depends: debhelper (>= 9.20141010),
                dpkg-dev (>= 1.17.14),
-               rustc (>= 1.16),
-# Direct dependency needed for cross-compiling
+               python-dulwich           <pkg.cargo.mkstage0>,
+               python-pytoml            <pkg.cargo.mkstage0>,
+               cargo:native    (>= 0.17.0) <!pkg.cargo.mkstage0>,
+               rustc:native    (>= 1.16),
                libstd-rust-dev (>= 1.16),
-               cargo (>= 0.13.0) <!pkg.cargo.mkstage0>,
-               python-dulwich <pkg.cargo.mkstage0>,
-               python-pytoml <pkg.cargo.mkstage0>,
                pkg-config,
                cmake,
                ca-certificates,
@@ -31,7 +31,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-rust/cargo.git
 
 Package: cargo
 Architecture: any
-Multi-Arch: foreign
+Multi-Arch: allowed
 Depends: ${shlibs:Depends}, ${misc:Depends},
          rustc (>= 1.1),
          binutils,